merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 6 Jul 2011 08:07:47 +0000 (17:07 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 6 Jul 2011 08:07:47 +0000 (17:07 +0900)
commit91cf7ef91ce34708b82a35a30454fac89c80841c
tree04199041d706763704c36cfd6a1814114ed35ec1
parent6f52499c99c4e6590b3be0947084da32414299ce
parent7b1edae8147e6ee1e58750347900ea89411f624d
merge trunk